squash and merge